eeeec61c3d919370d33fa88c53df7535964145da,seal/src/main/java/cn/rongcloud/im/SealUserInfoManager.java,SealUserInfoManager,getPortrait,#Friend#,1754

Before Change


     */
    private String getPortrait(Friend friend) {
        if (friend != null) {
            if (TextUtils.isEmpty(friend.getPortraitUri())) {
                if (TextUtils.isEmpty(friend.getUserId())) {
                    return null;
                } else {
                    UserInfo userInfo = mUserInfoCache.get(friend.getUserId());
                    if (userInfo != null) {
                        if (!TextUtils.isEmpty(userInfo.getPortraitUri().toString())) {
                            return userInfo.getPortraitUri().toString();
                        } else {
                            mUserInfoCache.remove(friend.getUserId());
                        }
                    }
                    List<GroupMember> groupMemberList = getGroupMembersWithUserId(friend.getUserId());
                    if (groupMemberList != null && groupMemberList.size() > 0) {
                        GroupMember groupMember = groupMemberList.get(0);
                        if (!TextUtils.isEmpty(groupMember.getPortraitUri()))
                            return groupMember.getPortraitUri();
                    }
                    String portrait = RongGenerate.generateDefaultAvatar(friend.getName(), friend.getUserId());
                    //缓存信æ?¯kit会使用,备注å??存在时需è¦?缓存displayName
                    String name = friend.getName();
                    if (friend.isExitsDisplayName()) {
                        name = friend.getDisplayName();
                    }
                    userInfo = new UserInfo(friend.getUserId(), name, Uri.parse(portrait));
                    mUserInfoCache.put(friend.getUserId(), userInfo);
                    return portrait;
                }
            } else {
                return friend.getPortraitUri();
            }
        }
        return null;

After Change


     */
    private String getPortrait(Friend friend) {
        if (friend != null) {
            if (TextUtils.isEmpty(friend.getPortraitUri().toString())) {
                if (TextUtils.isEmpty(friend.getUserId())) {
                    return null;
                } else {
                    UserInfo userInfo = mUserInfoCache.get(friend.getUserId());
                    if (userInfo != null) {
                        if (!TextUtils.isEmpty(userInfo.getPortraitUri().toString())) {
                            return userInfo.getPortraitUri().toString();
                        } else {
                            mUserInfoCache.remove(friend.getUserId());
                        }
                    }
                    List<GroupMember> groupMemberList = getGroupMembersWithUserId(friend.getUserId());
                    if (groupMemberList != null && groupMemberList.size() > 0) {
                        GroupMember groupMember = groupMemberList.get(0);
                        if (!TextUtils.isEmpty(groupMember.getPortraitUri().toString()))
                            return groupMember.getPortraitUri().toString();
                    }
                    String portrait = RongGenerate.generateDefaultAvatar(friend.getName(), friend.getUserId());
                    //缓存信æ?¯kit会使用,备注å??存在时需è¦?缓存displayName
                    String name = friend.getName();
                    if (friend.isExitsDisplayName()) {
                        name = friend.getDisplayName();
                    }
                    userInfo = new UserInfo(friend.getUserId(), name, Uri.parse(portrait));
                    mUserInfoCache.put(friend.getUserId(), userInfo);
                    return portrait;
                }
            } else {
                return friend.getPortraitUri().toString();
            }
        }
        return null;